reconcile: estate-standardization-20260607 onto main (preserve #34/#38 fixes)#40
Merged
Merged
Conversation
/#38 fixes) Brings the estate-standards catch-up (self-validating/ rename, bot_directives, contractiles refresh, governance docs) onto current main WITHOUT regressing the merged #34/#38 work. Conflict resolutions: - 4 CI workflows (dependabot-automerge, dogfood-gate, static-analysis-gate, hypatia-scan) -> take MAIN: its workflow layer has moved past the 6-day-old standardization (TruffleHog, codeql actions-extractor, hypatia-scan removal). hypatia-scan.yml stays deleted (consistent with dropping the superseded hypatia-scan-reusable-wrapper branch). - contractiles Justfile (add/add) -> take main. - bust/Bustfile.a2ml + dust/Dustfile.a2ml (modify/delete) -> KEEP main's versions (live, user-valued contractiles). - self-validating/ guards: git carried my K9! magic + pedigree fixes through the svc/k9 -> self-validating rename; ci.yml grammar-guard ^data_ anchor preserved. Verified on the reconciled tree: k9-validate-action 0 errors, a2ml-validate-action 0 errors. Standardization touches no Rust, so the code is main's unchanged. https://claude.ai/code/session_018CaSgNjNURC7ocsyjYh9We
hyperpolymath
marked this pull request as ready for review
June 14, 2026 01:08
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Reconciles the maintainer's
estate-standardization-20260607branch (the estate-standards catch-up) onto currentmain, resolving its divergence + conflicts with the merged #34/#38 work — somaincan adopt the standardization without regressing recent fixes.Brings onto main: the
svc/k9 → self-validating/rename,bot_directives, the contractiles refresh, governance docs, and flake updates.Conflict resolutions (7 files)
dependabot-automerge.yml,dogfood-gate.yml,static-analysis-gate.yml,hypatia-scan.ymlactionsextractor, hypatia-scan removal).hypatia-scan.ymlstays deleted — consistent with dropping the supersededhypatia-scan-reusable-wrapperbranch.contractiles/Justfile(add/add)bust/Bustfile.a2ml,dust/Dustfile.a2ml(modify/delete)Preserved from #34/#38 (auto-merged correctly): my K9! magic + pedigree fixes carried through the
svc/k9 → self-validatingrename; theci.ymlgrammar-guard^data_anchor; the nightly-toolchaintestjob.Verification
On the reconciled tree, run with the upstream actions:
k9-validate-action→ 0 errorsa2ml-validate-action→ 0 errorsThe standardization touches no Rust (only
.machine_readable/ workflows / flake / docs), so the code is main's, unchanged.Notes
estate-standardization-20260607and the supersededchore/hypatia-scan-reusable-wrapperbranches can be deleted.Generated by Claude Code